Update Elterngeld #756

ThOrtmann · 2024-05-13T09:03:11Z

Major refactoring of Elterngeld, introducing some new parameters.

What problem do you want to solve?

Updating the Functions of the Elterngeld to better reflect the BEEG

I have introduced some basic changes to better reflect the BEEG. These include a rework of some functions, as well as a new function

for more information, see https://pre-commit.ci

Added - elterngeld_nettolohn_vorj - zu_verst_eink-mit_kinderfreib_tu - arbeitsstunden_w - hat_kinder - Alleinerz as basic inputs and - elterngeld_anspruch as an output

Updated the Elterngeld_nettolohn_vorj_m variable name

Added - elterngeld_nettolohn_vorj_m - zu_verst_eink-mit_kinderfreib_tu - arbeitsstunden_w - hat_kinder - Alleinerz as basic inputs and - elterngeld_anspruch as an output

Attempted to adapt this Test to correctly interact with the reworked Elterngeld tests by implementing the elterngeld_nettolohn_vorj_m and zu_verst_eink_mit_kinderfreib_tu variables

for more information, see https://pre-commit.ci

Fixing errors regarding quotation marks and comma

Added - elterngeld_nettolohn_vorj_m - zu_verst_eink-mit_kinderfreib_tu - arbeitsstunden_w - hat_kinder - Alleinerz as basic inputs and - elterngeld_anspruch as an output

removed elterngeld_nettolohn_vorj_m and zu_verst_eink_mit_kinderfreib_tu

updated elterngeld_anspruch

for more information, see https://pre-commit.ci

Added max_einkommen_allein und max_einkommen_zsm to the Elterngeldparameters

for more information, see https://pre-commit.ci

updated einkommensbezugsgrenzen

updated the elterngeld_anspruch func

for more information, see https://pre-commit.ci

…abor-economics/gettsim into some_elterngeld_fixes

Updates some_elterngeld_fixes branch Updates the functions Updates the Tests

for more information, see https://pre-commit.ci

correctly compute the full_taxes_and_transfers tests

for more information, see https://pre-commit.ci

codecov · 2024-05-30T15:24:51Z

Codecov Report

Attention: Patch coverage is 98.50746% with 1 line in your changes missing coverage. Please review.

Project coverage is 90.04%. Comparing base (5d81581) to head (0892ca6).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
src/_gettsim/transfers/elterngeld.py	98.33%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #756      +/-   ##
==========================================
+ Coverage   89.99%   90.04%   +0.05%     
==========================================
  Files          53       53              
  Lines        3857     3878      +21     
==========================================
+ Hits         3471     3492      +21     
  Misses        386      386

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

for more information, see https://pre-commit.ci

src/_gettsim/parameters/elterngeld.yaml

JakobWegmann

Impressive work! I only have some minor detail questions.

src/_gettsim/transfers/elterngeld.py

docs/gettsim_objects/input_variables.md

src/_gettsim/transfers/elterngeld.py

hmgaudecker

Great work!

docs/gettsim_objects/input_variables.md

src/_gettsim/parameters/elterngeld.yaml

docs/gettsim_objects/input_variables.md

src/_gettsim/parameters/elterngeld.yaml

src/_gettsim/synthetic.py

src/_gettsim/transfers/elterngeld.py

…ns branch.

JakobWegmann · 2024-09-08T12:55:33Z

One more general question: As parental leave benefit is calculated based on the state of the law at January 1st for the year of the respective claim, changes to the law that take place during the year (in the last years this happens regularly for the lohnsteuer), should not influence the calculation of parental leave benefit. Is this implementable/implemented?

hmgaudecker · 2024-09-08T15:20:28Z

One more general question: As parental leave benefit is calculated based on the state of the law at January 1st for the year of the respective claim, changes to the law that take place during the year (in the last years this happens regularly for the lohnsteuer), should not influence the calculation of parental leave benefit. Is this implementable/implemented?

As long as only net income is concerned, see the discussion above. Else, we should make an issue for that, link from the docstring and if somebody needs that amount of detail, implement it!

…ute-of-labor-economics/gettsim into some_elterngeld_fixes

hmgaudecker

Maybe add the discussion on timings / running GETTSIM more than once somewhere so that it does not get lost. Maybe a page in the docs and link from docstrings of elterngeld_m and elterngeld_nettolohn_approximation_m, description of input variable elterngeld_nettoeinkommen_vorjahr_m ?

MImmesberger · 2024-09-10T18:15:54Z

@hmgaudecker Can you have a final look over the tutorial notebook. The warnings of the GETTSIM call outputs are present in all notebooks (issue #757),

hmgaudecker

The notebook is a very nice addition! I think, however, we should be very precise there. Not fully sure whether that is the case just yet!

docs/how_to_guides/calculating_elterngeld.ipynb

hmgaudecker · 2024-09-11T04:32:15Z

docs/how_to_guides/calculating_elterngeld.ipynb

+    "information from step 2.\n",
+    "\n",
+    "The reason for not doing this in one GETTSIM call (together with step 2) is that \n",
+    "1. the correct policy date of the net wage calculation (step 2) is always January 1st of\n",


I thought @JakobWegmann linked a law/directive saying that the parameters throughout the larger part of the year before birth mattered? So for a kid born in March, it would be 2023. For a kid born in November, 2024? Again, I'd argue for keeping our the standard approximation using the previous year, but we should be precise here, also for our own sanity when reading it down the road.

One law, three different interpretations 😅

§2e BEEG Abs. 1 Satz 2:

Die Abzüge für Steuern werden einheitlich für Einkommen aus nichtselbstständiger und selbstständiger Erwerbstätigkeit auf Grundlage einer Berechnung anhand des am 1. Januar des Kalenderjahres vor der Geburt des Kindes für dieses Jahr geltenden Programmablaufplans [...] ermittelt.

My interpretation is that the relevant parameters are the ones of the year before (i.e. child born in December 2024, parameters of January 1st 2023 are considered). I'll adjust the notebook accordingly, but intervene if you understand the law differently.

That would be my interpretation of the text, too! @JakobWegmann, could you weigh in one last time?

Yes, 1st of January of the calendar year before birth is correct (no matter the birth month).

I thought @JakobWegmann linked a law/directive saying that the parameters throughout the larger part of the year before birth mattered?

For the sake of completeness: That was about the input values of the function, so Steuerklasse, place of residence, church tax,...

Excellent, if all of you (@MImmesberger @JakobWegmann and maybe also @pia-molitor ?) could just read through the notebook text and fix any errors in my summary (+maybe add a link to the application form, Jakob?), we'll be good to go!

No complaints from my side.

Looks very good!

A direct link to a PDF: https://www.zbfs.bayern.de/imperia/md/content/zbfs_intranet/produktgruppe_i/formulare/beeg-antrag/2021_09_anlage_n_mit_info_.pdf

I find this part a bit confusing:

The Lohnsteuerklasse is always set on a yearly basis; if it changes with the start of the calendar year a child is born, the date of birth matters. Up to June, the Lohnsteuerklasse from the previous calendar year will be relevant; for July or later, the Lohnsteuerklasse from the current calendar year will be relevant.

I would simply delete it. Eventually, also the Steuerklasse is a choice of the data preparer.

Depends on the dataset, I guess 😄

I don't care either way, your call @MImmesberger, and then go ahead and merge!

I left it in there because it helped me to understand the purpose of the paragraph. I just added a "for example" to make clear that this reasoning also applies to the other variables.

ThOrtmann and others added 23 commits May 13, 2024 10:41

Update elterngeld.py

263c51b

I have introduced some basic changes to better reflect the BEEG. These include a rework of some functions, as well as a new function

[pre-commit.ci] auto fixes from pre-commit.com hooks

35bebb0

for more information, see https://pre-commit.ci

Update hh_id_1.yaml

c200412

Added - elterngeld_nettolohn_vorj - zu_verst_eink-mit_kinderfreib_tu - arbeitsstunden_w - hat_kinder - Alleinerz as basic inputs and - elterngeld_anspruch as an output

Update hh_id_1.yaml

0a2894e

Updated the Elterngeld_nettolohn_vorj_m variable name

Update hh_id_8.yaml

b781e65

Added - elterngeld_nettolohn_vorj_m - zu_verst_eink-mit_kinderfreib_tu - arbeitsstunden_w - hat_kinder - Alleinerz as basic inputs and - elterngeld_anspruch as an output

Update test_full_taxes_and_transfers.py

43af73b

Attempted to adapt this Test to correctly interact with the reworked Elterngeld tests by implementing the elterngeld_nettolohn_vorj_m and zu_verst_eink_mit_kinderfreib_tu variables

[pre-commit.ci] auto fixes from pre-commit.com hooks

efb8be5

for more information, see https://pre-commit.ci

Update test_full_taxes_and_transfers.py

2825933

Fixing errors regarding quotation marks and comma

Update hh_id_3.yaml

d5eb80b

Added - elterngeld_nettolohn_vorj_m - zu_verst_eink-mit_kinderfreib_tu - arbeitsstunden_w - hat_kinder - Alleinerz as basic inputs and - elterngeld_anspruch as an output

Update test_full_taxes_and_transfers.py

47a8a55

removed elterngeld_nettolohn_vorj_m and zu_verst_eink_mit_kinderfreib_tu

Update elterngeld.py

5e189fc

updated elterngeld_anspruch

[pre-commit.ci] auto fixes from pre-commit.com hooks

4e7c419

for more information, see https://pre-commit.ci

Update elterngeld.yaml

e08ad61

Added max_einkommen_allein und max_einkommen_zsm to the Elterngeldparameters

[pre-commit.ci] auto fixes from pre-commit.com hooks

ad6122d

for more information, see https://pre-commit.ci

Update elterngeld.yaml

f5550a4

updated einkommensbezugsgrenzen

Update elterngeld.py

d469b81

updated the elterngeld_anspruch func

[pre-commit.ci] auto fixes from pre-commit.com hooks

9dea761

for more information, see https://pre-commit.ci

Fix indentation error.

712436a

Merge branch 'some_elterngeld_fixes' of github.com:iza-institute-of-l…

08c750a

…abor-economics/gettsim into some_elterngeld_fixes

Closes #756

de1e7cc

Updates some_elterngeld_fixes branch Updates the functions Updates the Tests

[pre-commit.ci] auto fixes from pre-commit.com hooks

e8827b6

for more information, see https://pre-commit.ci

Updated Tests as well as the config.py files to

5aaca2a

correctly compute the full_taxes_and_transfers tests

[pre-commit.ci] auto fixes from pre-commit.com hooks

9bbed96

for more information, see https://pre-commit.ci

ThOrtmann and others added 6 commits May 30, 2024 18:54

updated max_eink parameters

0c1a608

Merge branch 'main' into some_elterngeld_fixes

dea89c7

Update parameter file.

5a1aaa8

Start to adjust module to new machinery.

df8819f

Add todos.

dd67b37

[pre-commit.ci] auto fixes from pre-commit.com hooks

981db5c

for more information, see https://pre-commit.ci

Clean up.

6af4eba

MImmesberger mentioned this pull request Sep 3, 2024

Add unterhaltsvors implementation 2009 to 2016 #790

Merged

JakobWegmann reviewed Sep 5, 2024

View reviewed changes

src/_gettsim/parameters/elterngeld.yaml Show resolved Hide resolved

JakobWegmann reviewed Sep 5, 2024

View reviewed changes

src/_gettsim/transfers/elterngeld.py Outdated Show resolved Hide resolved

src/_gettsim/transfers/elterngeld.py Show resolved Hide resolved

docs/gettsim_objects/input_variables.md Show resolved Hide resolved

src/_gettsim/transfers/elterngeld.py Outdated Show resolved Hide resolved

MImmesberger added 2 commits September 6, 2024 01:06

Jakobs comments.

6dea561

Some more fixes.

7655609

hmgaudecker reviewed Sep 6, 2024

View reviewed changes

Merge branch 'main' into some_elterngeld_fixes

52e1179

MImmesberger mentioned this pull request Sep 7, 2024

BUG: Elterngeld net wage should computed using the standard long-term care contribution rates #792

Open

MImmesberger and others added 3 commits September 7, 2024 14:16

First set of comments.

3ac1da2

Optional smoothing of replacement rate.

caf1a09

Update hooks so that we don't end up with conflicts in policy-functio…

86915e6

…ns branch.

MImmesberger added 2 commits September 8, 2024 18:46

Fix bug and add regression test.

242e84c

Merge branch 'some_elterngeld_fixes' of https://github.com/iza-instit…

fa34d53

…ute-of-labor-economics/gettsim into some_elterngeld_fixes

hmgaudecker approved these changes Sep 10, 2024

View reviewed changes

MImmesberger mentioned this pull request Sep 10, 2024

BUG: Mostly replace eink_st / soli_st by lohn_st / soli_st_lohnst #606

Open

Add notebook howto Elterngeld calculation.

da4b008

Update a paragraph.

f6e2129

hmgaudecker reviewed Sep 11, 2024

View reviewed changes

MImmesberger and others added 4 commits September 11, 2024 12:22

Adjust notebook and round Elterngeld.

02c01ce

Fix bug that occurs after May 2024.

d4e13c5

Update text with gist of Github discussion.

37b7df5

Adjust notebook slightly.

0892ca6

MImmesberger merged commit 8843fcc into main Sep 11, 2024

MImmesberger deleted the some_elterngeld_fixes branch September 11, 2024 22:27

This was referenced Sep 11, 2024

BUG: Elterngeld eligibility #697

Closed

BUG: Add Elterngeld maximum income threshold #599

Closed

Update Elterngeld #756

Update Elterngeld #756

Uh oh!

Conversation

ThOrtmann commented May 13, 2024 • edited by MImmesberger Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem do you want to solve?

Uh oh!

codecov bot commented May 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

JakobWegmann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hmgaudecker left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JakobWegmann commented Sep 8, 2024

Uh oh!

hmgaudecker commented Sep 8, 2024

Uh oh!

hmgaudecker left a comment

Choose a reason for hiding this comment

Uh oh!

MImmesberger commented Sep 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hmgaudecker left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MImmesberger Sep 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ThOrtmann commented May 13, 2024 •

edited by MImmesberger

Loading

codecov bot commented May 30, 2024 •

edited

Loading

MImmesberger commented Sep 10, 2024 •

edited

Loading

MImmesberger Sep 11, 2024 •

edited

Loading